luci-mod-network: organize "cache" tab in dhcp/dns views

Delete the tab from dhcp.js, mark the options that belong to it in dns.js.

Signed-off-by: David Härdeman <[email protected]>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index a6cc96b934f7000eecd08950d1c49f10738e28b4..1b4af65472f617472fbbca9a4c0068d722374caa 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -391,7 +391,6 @@ return view.extend({
 
 
                s.tab('general', _('General'));
-               s.tab('cache', _('Cache'));
                s.tab('devices', _('Devices & Ports'));
                s.tab('dnsrecords', _('DNS Records'));
                s.tab('dnssecopt', _('DNSSEC'));
@@ -420,17 +419,6 @@ return view.extend({
                o.optional = true;
                // End general
 
-               o = s.taboption('cache', form.MultiValue, 'cache_rr',
-                       _('Cache arbitrary RR'), _('By default, dnsmasq caches A, AAAA, CNAME and SRV DNS record types.') + '<br/>' +
-                       _('This option adds additional record types to the cache.'));
-               o.optional = true;
-               o.create = true;
-               o.multiple = true;
-               o.display_size = 5;
-               recordtypes.forEach(r => {
-                       o.value(r);
-               });
-
                s.taboption('filteropts', form.Flag, 'domainneeded',
                        _('Domain required'),
                        _('Never forward DNS queries which lack dots or domain parts.') + '<br />' +

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
index b5bb26066c6ff91da969668be32b6446a6b41a25..61b09b84a6a231734b3a0e08bf35264bc925ce27 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
@@ -456,6 +456,7 @@ return view.extend({
                o.optional = true;
                // End general
 
+               // Begin cache
                o = s.taboption('cache', form.MultiValue, 'cache_rr',
                        _('Cache arbitrary RR'), _('By default, dnsmasq caches A, AAAA, CNAME and SRV DNS record types.') + '<br/>' +
                        _('This option adds additional record types to the cache.'));
@@ -466,6 +467,7 @@ return view.extend({
                recordtypes.forEach(r => {
                        o.value(r);
                });
+               // End cache
 
                s.taboption('filteropts', form.Flag, 'domainneeded',
                        _('Domain required'),